src/bidi.c: Fix type of a variable revealed on x86_64.

diff --git a/src/ChangeLog b/src/ChangeLog
index b8aa75f8fb460c9d53e00f70df81269e085271b2..0ee5728e3c0e9ac8cba3c1b86774983dfcd63172 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,8 @@
 2011-07-09  Eli Zaretskii  <eliz@gnu.org>
 
+       * bidi.c (bidi_fetch_char): Fix the type of `len' according to
+       what STRING_CHAR_AND_LENGTH expects.
+
        * xdisp.c (move_it_in_display_line_to): Record prev_method and
        prev_pos immediately before the call to set_iterator_to_next.
        Fixes cursor motion in bidi-reordered lines with stretch glyphs

diff --git a/src/bidi.c b/src/bidi.c
index 5b26ecf0854ba25801ebca04cbd9bf814d49578b..a25e248954751a6333f40d3c4bb0b9676e898cb9 100644 (file)
--- a/src/bidi.c
+++ b/src/bidi.c
@@ -922,7 +922,7 @@ bidi_fetch_char (EMACS_INT bytepos, EMACS_INT charpos, EMACS_INT *disp_pos,
     {
       if (string->s)
        {
-         EMACS_INT len;
+         int len;
 
          if (!string->unibyte)
            {
@@ -937,7 +937,7 @@ bidi_fetch_char (EMACS_INT bytepos, EMACS_INT charpos, EMACS_INT *disp_pos,
        }
       else if (STRINGP (string->lstring))
        {
-         EMACS_INT len;
+         int len;
 
          if (!string->unibyte)
            {